properly __initdata-annotate command line option string buffers

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
index cf6730a4dc1d59bcc549266ea8a9262e783b81a7..25d92e1527723a53c151a26859a83d3ead64be65 100644 (file)
--- a/xen/arch/x86/acpi/power.c
+++ b/xen/arch/x86/acpi/power.c
@@ -32,7 +32,7 @@
 
 uint32_t system_reset_counter = 1;
 
-static char opt_acpi_sleep[20];
+static char __initdata opt_acpi_sleep[20];
 string_param("acpi_sleep", opt_acpi_sleep);
 
 static u8 sleep_states[ACPI_S_STATE_COUNT];

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 0c35e58b3d19d73edbc1282e12361d72207e699e..ecc2f1f9385f26a0785493ca940a02d8347a083f 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -101,10 +101,10 @@ struct vcpu *__init alloc_dom0_vcpu0(void)
     return alloc_vcpu(dom0, 0, 0);
 }
 
-static unsigned int opt_dom0_shadow;
+static unsigned int __initdata opt_dom0_shadow;
 boolean_param("dom0_shadow", opt_dom0_shadow);
 
-static char opt_dom0_ioports_disable[200] = "";
+static char __initdata opt_dom0_ioports_disable[200] = "";
 string_param("dom0_ioports_disable", opt_dom0_ioports_disable);
 
 #if defined(__i386__)

diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c
index bbffc7c30e09ae16042133902917c9194bf5bab6..cf03139d7f14555f4b6bab9ad853d961ffae7acc 100644 (file)
--- a/xen/common/gdbstub.c
+++ b/xen/common/gdbstub.c
@@ -65,7 +65,7 @@ static atomic_t gdb_smp_paused_count;
 static void gdb_smp_pause(void);
 static void gdb_smp_resume(void);
 
-static char opt_gdb[30];
+static char __initdata opt_gdb[30];
 string_param("gdb", opt_gdb);
 
 static void gdbstub_console_puts(const char *str);

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index f175ff9f7cb90397f5886ca97ce0392d4fcb67df..29e10759a34caa0faf0bac428c4536348195284e 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -45,7 +45,7 @@
  * Comma-separated list of hexadecimal page numbers containing bad bytes.
  * e.g. 'badpage=0x3f45,0x8a321'.
  */
-static char opt_badpage[100] = "";
+static char __initdata opt_badpage[100] = "";
 string_param("badpage", opt_badpage);
 
 /*

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 9b59ea6d8423f20e7bb02bed34c43811116d045e..9a53be9b8144fc50642624938a57fe23ad8c49cb 100644 (file)
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -35,7 +35,7 @@
 #include <xsm/xsm.h>
 
 /* opt_sched: scheduler - default to credit */
-static char opt_sched[10] = "credit";
+static char __initdata opt_sched[10] = "credit";
 string_param("sched", opt_sched);
 
 /* if sched_smt_power_savings is set,

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 98fc4615c450b428e1723154f940b1be97127846..a12a6caf7192a923435c6fc5e135a38a1ecf9f42 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -36,7 +36,7 @@
 #include <public/sysctl.h>
 
 /* console: comma-separated list of console outputs. */
-static char opt_console[30] = OPT_CONSOLE_STR;
+static char __initdata opt_console[30] = OPT_CONSOLE_STR;
 string_param("console", opt_console);
 
 /* conswitch: a character pair controlling console switching. */
@@ -676,7 +676,7 @@ void __init console_endboot(void)
     switch_serial_input();
 }
 
-int console_has(const char *device)
+int __init console_has(const char *device)
 {
     char *p;
 

diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index edbb6f89393fe57639260f778ea52f43aba18c2d..e979f29d4a3f4ba5650019bd5ca37a3450b41a4e 100644 (file)
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -25,7 +25,8 @@
  * can be specified in place of a numeric baud rate. Polled mode is specified
  * by requesting irq 0.
  */
-static char opt_com1[30] = "", opt_com2[30] = "";
+static char __initdata opt_com1[30] = "";
+static char __initdata opt_com2[30] = "";
 string_param("com1", opt_com1);
 string_param("com2", opt_com2);
 

diff --git a/xen/drivers/video/vga.c b/xen/drivers/video/vga.c
index e1828c1687190d839bf92add01afaa52d606d394..6a22d6f77acfb560409c22a0913b8158a524292d 100644 (file)
--- a/xen/drivers/video/vga.c
+++ b/xen/drivers/video/vga.c
@@ -48,7 +48,7 @@ void (*vga_puts)(const char *) = vga_noop_puts;
  * after domain 0 starts to boot. The default behaviour is to relinquish
  * control of the console to domain 0.
  */
-static char opt_vga[30] = "";
+static char __initdata opt_vga[30] = "";
 string_param("vga", opt_vga);
 
 /* VGA text-mode definitions. */